Autogenerated HTML docs for v2.47.0-72-gef8ce8
diff --git a/gitworkflows.html b/gitworkflows.html index d5085e9..82d3281 100644 --- a/gitworkflows.html +++ b/gitworkflows.html
@@ -488,8 +488,8 @@ beginning. It is always easier to squash a few commits together than to split one big commit into several. Don’t be afraid of making too small or imperfect steps along the way. You can always go back later -and edit the commits with <code>git rebase --interactive</code> before you -publish them. You can use <code>git stash push --keep-index</code> to run the +and edit the commits with <code>git</code> <code>rebase</code> <code>--interactive</code> before you +publish them. You can use <code>git</code> <code>stash</code> <code>push</code> <code>--keep-index</code> to run the test suite independent of other uncommitted changes; see the EXAMPLES section of <a href="git-stash.html">git-stash(1)</a>.</p> </div> @@ -725,7 +725,7 @@ <div class="title">Recipe: Verify <em>master</em> is a superset of <em>maint</em></div> <div class="content"> <div class="paragraph"> -<p><code>git log master..maint</code></p> +<p><code>git</code> <code>log</code> <code>master</code><code>..</code><code>maint</code></p> </div> </div> </div> @@ -741,7 +741,7 @@ <div class="title">Recipe: Release tagging</div> <div class="content"> <div class="paragraph"> -<p><code>git tag -s -m "Git X.Y.Z" vX.Y.Z master</code></p> +<p><code>git</code> <code>tag</code> <code>-s</code> <code>-m</code> "Git <code>X.Y.Z</code>" <code>vX.Y.Z</code> <code>master</code></p> </div> </div> </div> @@ -777,7 +777,7 @@ <div class="title">Recipe: Copy maint</div> <div class="content"> <div class="paragraph"> -<p><code>git branch maint-X.Y.(Z-1) maint</code></p> +<p><code>git</code> <code>branch</code> <code>maint-X.Y.</code>(<code>Z-1</code>) <code>maint</code></p> </div> </div> </div> @@ -791,10 +791,10 @@ <div class="ulist"> <ul> <li> -<p><code>git checkout maint</code></p> +<p><code>git</code> <code>checkout</code> <code>maint</code></p> </li> <li> -<p><code>git merge --ff-only master</code></p> +<p><code>git</code> <code>merge</code> <code>--ff-only</code> <code>master</code></p> </li> </ul> </div> @@ -820,13 +820,13 @@ <div class="ulist"> <ul> <li> -<p><code>git switch -C next master</code></p> +<p><code>git</code> <code>switch</code> <code>-C</code> <code>next</code> <code>master</code></p> </li> <li> -<p><code>git merge ai/topic_in_next1</code></p> +<p><code>git</code> <code>merge</code> <code>ai/topic_in_next1</code></p> </li> <li> -<p><code>git merge ai/topic_in_next2</code></p> +<p><code>git</code> <code>merge</code> <code>ai/topic_in_next2</code></p> </li> <li> <p>…​</p> @@ -914,7 +914,7 @@ <div class="title">Recipe: Push/pull: Publishing branches/topics</div> <div class="content"> <div class="paragraph"> -<p><code>git push <remote> <branch></code> and tell everyone where they can fetch +<p><code>git</code> <code>push</code> <em><remote></em> <em><branch></em> and tell everyone where they can fetch from.</p> </div> </div> @@ -932,7 +932,7 @@ <div class="title">Recipe: Push/pull: Staying up to date</div> <div class="content"> <div class="paragraph"> -<p>Use <code>git fetch <remote></code> or <code>git remote update</code> to stay up to date.</p> +<p>Use <code>git</code> <code>fetch</code> <em><remote></em> or <code>git</code> <code>remote</code> <code>update</code> to stay up to date.</p> </div> </div> </div> @@ -959,7 +959,7 @@ <div class="title">Recipe: Push/pull: Merging remote topics</div> <div class="content"> <div class="paragraph"> -<p><code>git pull <URL> <branch></code></p> +<p><code>git</code> <code>pull</code> <em><URL></em> <em><branch></em></p> </div> </div> </div> @@ -986,11 +986,11 @@ <div class="ulist"> <ul> <li> -<p><code>git format-patch -M upstream..topic</code> to turn them into preformatted +<p><code>git</code> <code>format-patch</code> <code>-M</code> <code>upstream</code><code>..</code><code>topic</code> to turn them into preformatted patch files</p> </li> <li> -<p><code>git send-email --to=<recipient> <patches></code></p> +<p><code>git</code> <code>send-email</code> <code>--to=</code><em><recipient></em> <em><patches></em></p> </li> </ul> </div> @@ -1009,7 +1009,7 @@ <div class="title">Recipe: format-patch/am: Keeping topics up to date</div> <div class="content"> <div class="paragraph"> -<p><code>git pull --rebase <URL> <branch></code></p> +<p><code>git</code> <code>pull</code> <code>--rebase</code> <em><URL></em> <em><branch></em></p> </div> </div> </div> @@ -1027,13 +1027,13 @@ <div class="title">Recipe: format-patch/am: Importing patches</div> <div class="content"> <div class="paragraph"> -<p><code>git am < patch</code></p> +<p><code>git</code> <code>am</code> < <code>patch</code></p> </div> </div> </div> <div class="paragraph"> <p>One feature worth pointing out is the three-way merge, which can help -if you get conflicts: <code>git am -3</code> will use index information contained +if you get conflicts: <code>git</code> <code>am</code> <code>-3</code> will use index information contained in patches to figure out the merge base. See <a href="git-am.html">git-am(1)</a> for other options.</p> </div>
